Merge branch 'bug/14091' into release/0.10.2