Merge "Add vsakharov user to maintenance team"