Port back Testing and CA-135649 from xs64bit