Initial implementation of size calculation
Merge remote-tracking branch 'upstream/master' into delegateHightAdjuster