Merge remote-tracking branch 'hoatle/tasks/3_spec_template'