[DF-None] Fix mistake
Merge branch 'development' into geometry_sorting