Merge "Clean up after RTT operations finished. (1/2)" into oc-dev