Merge "Update maintainers list" into integration