Why set to null? They're helpful to default.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop