fpga merge test
Merge branch 'fpgafix'
fpga fix