Some debugging for size calcaulations.
Merge branch 'test' into dev