Administrator requested to merge rs/upgrade-p4-fusion into main Mar 25, 2022

Created by: ryanslade

Also compiled with debug info at the request of the author.

Test plan

Confirmed that new version builds and runs.