Merge "Remove newline from "capturing trace..."" into oc-dev