Implement xp-framework/rfc#283 with PR #28