Merging the job_templates branch into devel