Merge pull request #1696 from clebertsuconic/2.3.x

Transfer queue tool