Cross-merge from master for PR #3042