All tests pass after merge of refcontext dode from DEV