Merge "Update list of main maintainers" into integration