Merge "Case sensitive label matching" into feature/zuulv3