Fixed length check for queue length check.
Merge branch 'test' into dev