implement dkf
Merge branch 'DKF' into develop