Merge branch '1851_xdg_fix' into 4.8.1-stable