[#55503242] Changes for amd64