Integration - Merge fixes