Merge "Removing unused invert helpers" into pi-dev