Check for existence where number is null
Merge commit '0d97605b4b9c37481dd4c37fa46f1138f373149b' into develop