Merge branch 'stable-etxff-bugfix' into stable