Now that dual feature development of 2.7 and 3.0 has finished and we're only working on new features in 3.0, forward merges from 2.7.x into main should result in a forward port issue being created.