Merge "Updating templates section setting up chapter"