Merge pull request #2754 from ExpressLRS/merge-3.4.2-into-master