Merge branch 'mattrpav-AMQ-9426'