Merge commit 'c6e7fbc5516842945b9b375f7724438dece10627' into release/2.1