Implement xp-framework/rfc#286 with PR #24