Upgraded rx
Upgrade to AMQ 5.9.1
Upgraded AHC
Polished