Feature/ddf 670 with jerens