Merge "Revert "Merge commit '744e99a' into merge""