Extended support data (XP3)
Merge remote-tracking branch 'upstream/master' into patch-1