Merge "Fix segmentation fault in hbd path"