Merge commit '614ec43f177df84c79f4b28f9c9717d9e05f6fc4' into HEAD
Merge commit 'a3cae83' into mainline