Merge "Extend template to set up additional values:" into release/2019.2.0