Xps update

Merged Rubel Mozumder requested to merge xps_update into develop

Merge request reports