BS-7289 fixes after demo