[FSDSS-682] FSDSS-682