Logout templates - Missing rpUIContext for initiating SP

[Manuel Haim]

Hi list,

on the IdP v3.3.1 logout templates (logout.vm, logout-propagate.vm), I
am trying to show some information on the service providers which the
users logged out from (using property idp.logout.elaboration = true).

However, the multiRPContext variable lacks information on the SP which
has initiated the logout. Is there an easy way to get an rpUIContext
object containing information for the initiating SP?

Within the velocity templates, I can only extract its relyingPartyId:

#set ($rpContext =
$profileRequestContext.getSubcontext('net.shibboleth.idp.profile.context.RelyingPartyContext'))
#set ($sp = $rpContext.getRelyingPartyId())

I guess defining another "SetRPUIInformation" bean in logout-beans.xml
and logout-flow.xml would help to get an appropriate rpUIContext object,
but I am not very familiar with all the required parameters yet. Has
anybody done this before?

Kind regards,
Manuel