PMO-2457 - Enhance build.xml