#22572 - updated to use latest version paths_from_template