Merge "Adaptation to changes in ECS, PMS and RAPP Catalogue"