Fixes specific for XDN

Hi. Could you please explain what is this changes for?