Merge branch 'bug_749_ethread_bugfix' into experimental