merged sponsoring-org into master