Point at merged cpp-common