Re: Forward-porting from release/ into develop

I'd suggest that part of putting something on a stable/release branch should also involved cherry picking it to master if needed. That way nothing is forgotten and there's no huge, error-prone merge task to do at some later time by someone who's not familiar with all the patches involved. Looks

Forward-porting from release/ into develop

In case you missed it, our branch policy is now that we work mainly on the latest release branch (bug-fixes, small improvements). However, we also do some work on develop (new features, backward-incompatible changes).