Fixed "Pocket Plane location" in GAM
Merge branch 'devel' into devel-ci