Merge branch 'features/JAL-3858_PAEsInProjects' into develop