US717 - Fixing merge issues