GM-7014: Fixing update/merge from seimos