v3.8-rc
82bafd9f · Merge pull request #1407 from Areloch/Companion_PR_1398 ·