Trying to merge from gresh pull
Resolved merge issues on pull
through dormant recalc and normal/count adjustments