Update notes for submitted changes

* merge all changes from private git 12.234.32.41 to public git compass-core. Fix all broken tests caused by the code change.