LRDCOM-4100
LRDCOM-4100 apply to WSRP as well