Cross merge from master for PR #2843