Merge "Cleanup components doc" into feature/zuulv3