merge step-trace branch with master branch