A third version of GA. I have splitted the first big commit into smaller ones, and combined the fix merges into one.