Removing GA from main line branches
Merge branch 'develop'