cherry pick atf features for dev branch

as i do not yet (possibly never) want to merge !24 we need to move atf features from that branch