Merge branch 'develop' into 613-restrict-file-feature-in-files-tab-an…

Merge branch 'develop' into 613-restrict-file-feature-in-files-tab-an… #1499