No, it ends with the last 3.5 maintenance release in about 6 months.  When I did it right, as in #27245, which was otherwise a clean single file merge, there was no problem and it took at most an extra 30 seconds.  I know what I did wrong this time, starting with not writing down the steps needed, and in which order, for a much more complicated merge.