suggestions from Pierre Delaage). (cherry picked from commit 668bcfd5) Resolved conflicts: util/pl/VC-32.pl