Prd/gid/bec 4123 circular emails

unit/integration tests from prd not completely done yet...