LPS-35354 changes to staging to support templates without structure