Update of BnoC line-booking code

Hi @tlatham , I found your commit to update BnoC line-booking in !2300 (merged) is not merged into master.

Could you open a new MR to update BnoC line-booking code? Many thanks.

(cc @msaur ,@peilian ,@fswystun )