Minor updates
Merge branch 'development' into job_stage