Redelivery after merge of HA for tracing and new exception handling

Change-Id: I6064ba7305ad05ed979fd2afd5405864c5d5f347