cannot use truthy check.
Merge branch 'develop' into grid