Implement xp-framework/rfc#98 with PR #21