Merge branch 'pgt' (early part) into devel