Update to latest CM v4 upstream