Feature/cfy 509 fix dev mode