Merge "Cumulative patch from commit 3d6953288b592704484864f41791f8c67ff9aa5a"