Merge "Snap for 5714901 from 562202cf1e9899b55c457947810c62f97f896b18 to pie-vts-release" into pie-vts-release