Merge "fix(xilinx): fix mismatching function prototype" into integration