Merge branch 'AMQ-8012'

This closes #553