merge into Ejecta-compatible package