Fixing merge form master compatibility problems.