[wip] RSDayFlow Backport

No concrete dates yet but it helps to have a pull request.
- [ ] change 3 to 6