[FSDSS-887] FSDSS-887