Implement xp-framework/rfc#276 with PR #27