Merge "Add finger gateway" into feature/zuulv3