SB-1854: Rifa

Owned by Rhith