CC-5929: Certain long filenames can result in the extension getting cut off
Merge branch 'cc-5709-airtime-analyzer' into saas