Added tweaks for merge_with_master