Merge with main. Update comment regarding SHB target BW.