added queue init
Merge remote-tracking branch 'root_dev/master'
sync with official dev