BS-10854
First impl