merge release/2.6 as it is merged into master as tag PG-2.7