closes PR 10380 original commit: 100b4d31f12d9e90e0fcec73abb68e2cd89b8920
original commit: 28b404307793f041bb3363135a2968e283855318