Merge "Change context assignment mechanism." into tm-dev