Changes related to control value null handling