Backport #1792 to 2.3
Merge remote-tracking branch 'origin/feature/pr_1792_23' into temp/rc