Merge "Misc GAR fixes" into pi-dev