Merge "Fix attribute syntax in docs" into feature/zuulv3