Merge "Snap for 5042378 from bd365067e09b902ecc036424fccf0fb9154cdca5 to pie-vts-release" into pie-vts-release