Changes from master to production (ValuationReport_NO.xdp)