AFP ingest urgency fix
Merge remote-tracking branch 'upstream/master'
Additional tests have been added