Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1