Merge "fix(xilinx): don't reserve 1 more byte" into integration