SFV-1424 Fixed google maps support
Merge branch 'googlemapsv3fix' into 13.0