[FSDSS-715] FSDSS-715