hand merge changes to master since branching