merge PR #11490