resolve merge conflicts of 9b726ab8 to master