Merge branch 'context-test-cases-for-cond-lock' into josh