updated configuration templates and init command
Merge commit '2cc6dae52959bfa7825e0f4254450e76040c4a33'