Merge "API Documentation and Constant cleanup." into pi-dev