Merge commit 'c85e5f13f6ac9c4c90125e7671d89009e57f9df9' into release/1.1