Resolve "cherry pick atf features for dev branch"

Ubbo Veentjerrequested to merge
211-cherry-pick-atf-features-for-dev-branch into develop

Closes #211 (closed)

Merge request reports