Merge "Revert "Merge commit '8bd143b' into merge""