KFSUPGRADE-1052 need to use null instead of empty, need to leave itn the
embedded stuff