Merge pull request #1128 from ludovic-henry/pr19g-sgen-grayqueue