Merge branch 'trustintegration' into googlemaps