Merge "QS + DND interaction again" into oc-dev