Merge "Remove dry run flag and its use"