Merge "Add Doctor maintenance job"