is one piece episode 936 filler?

Zoro tells Hiyori that he is Momonosuke's ally, confirming that he, along with Kin'emon and the others are all alive. Hiyori explains the fateful day twenty years ago.

When Orochi overthrew the Kouzuki Family, Toki used her Devil Fruit powers to send Kin'emon, Momonosuke, Kanjuro, Raizo and Kikunojo twenty years into the future. Hiyori was left behind so that if Momonosuke did not make it into the future, the Kouzuki bloodline would not die.

Both Oden and Toki would be slain during the coup, but Hiyori would survive as Kawamatsu helped her escape.