CDB-1858 bugfixed
Merge remote-tracking branch 'origin/CDB-1858' into hotfix/20140225