Ticket #32382 Vss format fixes