Need `if not null` (NPE in template) - will fix during merge