Merge tag 'fix-xpm-unavailable' into develop