I recently sent an email about switching from backport-based release management to 'forward-port' (whatever that actually means), where we merge release branches into master instead of cherry-picking the opposite way.
We need to have the guidelines updated on this.