Merge branch 'bug/14043' into release/0.10.2