New scenarios
Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit
Bug fix
Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl
small updates to switch and filtering of direct addresses