[GIT PULL] Xilinx fixes for v2020.04-rc4