NULL values to be mapped correctly against criteria
NULL values to be mapped correctly against criteria

(cherry picked from commit 71bd9a3583b1fb04166609f8cd9b5dce06c5c59a)

unepwcmc/SAPI,unepwcmc/SAPI,unepwcmc/SAPI,unepwcmc/SAPI