fixed dropbox loading twice CDB-339 CDB-572
Merge remote-tracking branch 'origin/CDB-339' into release/2.1.5