Merge "Be less agressive with implied branch matchers" into feature/zuulv3