resolve merge conflicts of ba455914 to master