Merge branch 'GONRG-3109_move_common_logic' into 'master'

GONRG-3109: move common logic from ingestion

See merge request !2
4 jobs for master in 7 minutes and 35 seconds (queued for 1 second)