sync with Pirum GH-61 request
add same feature as Pirum GH-61 with default template