Sync to origin. List of changes. More fixes and tests on the way.