Merge tag 'v1.18.2' into development

Fix batch import
Headless by default