Fix issue MR-355 - Moving sub folders to top level causes property loss
Merge branch 'release/1.70' into develop