Synced with master branch on gait recorder fix