Merge "Remove item.layout" into feature/zuulv3