+1 to leaving latest-cpp/merge-cpp out of the 5.0.x jobs, as @rleigh-dundee's C++ work isn't being backported.