S69873 - Fixing merge