Fixes #6188 - Dynflowized activation key creation

- [x] Dynflowize activation key creation
- [x] Fix old tests