Merge "BUG 2667 : Handle null value type"