Merge branch 'develop' into bug/JAL-4238_PAEs_not_being_shown_in_JalviewJS