small QA changes (static imports)
added test for override
QA: static imports
Merge remote-tracking branch 'origin/sponsoring-org' into sponsoring-org