Merge xp-framework/xp-framework#359