Cross-merge from master PR #3199