Merge remote-tracking branch 'origin/bug_749_ethread_bugfix'