Fixed compile issue in XOP from recent changes
Merge remote-tracking branch 'origin/bleeding-jumbo' into memdbg