BHV-6745: code changes to enable resetting value back to null