Fix unknown entity error on merge (fixes #1618)
Add presets (#1617)