Merge pull request #1452 from jnpkrn/schema-upgrade-temporary-fix
High: schema upgrade: temporary fix to avoid crash on newly present text