Issue#161: Update GPI headers and common code - not working state