[openFATE 306007] Ship more vanilla