Manually merged in ORM changes from T-Bag
Manually merged Entity changes from Tony