Merge pull request #421 from pberde/master

Single updates queue changes to solve jira:155