Merge "Fix for differentiating no data vs 0s"