ISPN-4826 X-Site State transfer values not propagated correctly