Merge "Remove unneeded context" into pi-dev