ASSET-66783 | ASSET-66783