Fix merge conflict from merging freeze_shape_branch to master