Merge branch 'development/GPS'