[NSFS-225] NSFS-225