Merge "Fix inproper queue." into klp-dev