Merge commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250' into release/2.2