Implement xp-framework/rfc#282 with PR #25