Merge "Insert directives to work around a CPU bug."