Cross-merge from master for PR #3063, #3065