Sync changes from core
changelog
Remove dead files
Remove failing C++ test
Re-add failing C++ test