fixup! s4-common: create common s4 vendor for proprietary files