Merge branch 'RAF09' into RtkGps