Merge branch '2662_fix_space_calculation'