XASPER-19061

XASPER-19061