Merge branch 'es/bugreport'