[BNSPS-359] BNSPS-359