Merge "Snap for 4994203 from 641b3da47a5164698088dc9046ea56c026df891a to pie-vts-release" into pie-vts-release