Ports from v9 changes
Class Bound
JS cleanup
Data and Model related updates
Various fixes