Pull up changes to ensure Merge will work later

Just to be extra prepared.