[sr-dev] git:master: mohqueue: fixes