Part of ticket IQSS/geoconnect#71