Merge changes made to pg release/2.8 into pg develop branch