GPII-228: Cleaned up branch