BS-6839 reopen