Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com> Backport of b971c1cd78a0bf831c1c30080089c4a384d037a0 from master