Merge "x86_64: Several fixes required for enabling promotion"