resolve merge conflicts of 9b726ab8 to master am: 02473c7876