context changes for 2.7