Cross-merge from master from PR #2870