Merge "Fix path exclusions" into feature/zuulv3