Version 2.2 refactoring, Rhea support
fix type name lookup in GlobalPriceData
Merge branch 'dev'