taking into consideration the existing feature
flag. It also split a couple of fields which
were previously only used for scan execution scan.

Changelog: changed
EE: true