Merge "Fix the rendering of item entries" into feature/zuulv3