HCOLL-23 removed loopback
Merge remote-tracking branch 'origin/master'