Merge from master to fix tests.