Merge pull request #6428 from DieHertz/bfdev-gyro-analyse-refactor