Merge branch 'fix/xilinx' into fixes