Merge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2