HCOLL-167 added   @Test(timeout = 5000)
Merge remote-tracking branch 'origin/master'