Implement xp-framework/rfc#288