Use BXP not XP for SH transferred xp
Merge branch 'origin/7.x-1.x'