XD-161 Fix Merge