[backport -> release/3.8.x] fix(core): make deprecated shorthand fields take precedence when new value is null

[backport -> release/3.8.x] fix(core): make deprecated shorthand fields take precedence when new value is null #2281