XLCLOUD-1910 restricted policy mapping