Whiterock

Whiterock rc2

rc2:
Pickup changes
Optimisation improvements
Renamed to Whiterock