Resolving more cherry-pick merge issues