Merge branch 'develop' into unused-planes-retrieval