Draft: Merge pipeline/staging/upgrade/organization-module into staging