Implemented fix for 3.16

Also fixed boot settings task by converting to template