Update to dev with latest pmlrsg-GISportal:dev code