Merged #4087 into this week release branch