Merge branch 'feature/JAL-4159_pasimap' into develop