CSIT-898: WRK improvments