Context changes for 2.7