Merge remote-tracking branch 'os-core-common/feature/GONRG-1088-Ingestion_Refactoring' into refactoring_ingest # Conflicts: # pom.xml
