XLCLOUD-1495 Moving XSA to a separate layer.