BS-11393
Apply sirius patch