Merge branch 'hs/fix-proxy-bh' (Closes 2656)