adapt to kwf changes in master