fix(rebase): rebased master and migration

Mixed double and single quotes.<br>Use '!==' to compare with 'null'.