[#854] The implementation of new template option's behavior