[FSDSS-684] FSDSS-684