Merge branches 'release' and 'gpe-ack' into release