Merge remote-tracking branch 'fix/jb-exp-hsicfix'