Merge branch 'features/JAL-3858_PAEsInProjects' into features/JAL-4134_treeviewerforc...