Improve BSN macros and add ICBINBSN-like scene retention (#181)

Improve BSN macros and add ICBINBSN-like scene retention (#181) #628