Merge "Remove master only job"