- Still need some SAI fixing when it resets so it continues the path (cherry picked from commit 771dfe243df1cec097ae7f1497bdbd7ece8a3afc)
- Still need some SAI fixing when it resets so it continues the path (cherry picked from commit 771dfe243df1cec097ae7f1497bdbd7ece8a3afc)