Merge "Retain user Context as local val for the test duration" into tm-dev