Merge "Update QS if the content gets stale" into oc-mr1-dev