Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a' * commit 'f31f365a7708c931e955670bc6213fdc8f91a87a': Fix issues 2333450 and 2333559:
Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a' * commit 'f31f365a7708c931e955670bc6213fdc8f91a87a': Fix issues 2333450 and 2333559: