[PG] 2nd draft WIP of 2.8.0