[PD-dev] how to maintain "main" 0.38 and 0.39 branches together?