ticket:4 test fail
ticket:4 tests pass
Merge branch 't4_context'