Implement xp-framework/rfc#290 with PR #41