Incorporated uvt/wopr changes without FOLIA and xmlserver.