MBST-5423 queue changes