[PD-dev] making 0.40-extended branch tomorrow