Merge "Fix date going missing in QS" into oc-dev