Merge "Added geomask backend support"