Move GA code to head
Merge branch 'develop'