Fixed issue #2040
Merge branch 'develop' into RemoteCollectionManager