fixes I-107610 and patches I-106743
Merge branch 'patch-I-106743' into dev