Merge branch 'func_enqueue'
Missing 'queue:' in key composition
Merge branch 'master' into func_enqueue