Merge "Fix coverity defects found on the FPGA port." into integration