Fix exception while deleting message from transactional queue
Merge branch 'master' into develop