Merge "Check null condition of number before contact query" into klp-dev