Merge "Don't merge post-merge items" into feature/zuulv3