Merge "Random hacks to make QS DND work" into oc-dev