Moved PR #356 into value_config_template branch