Merged changes from J6 version. Queue + config now available for J5