Merge branch 'bugfixes' into test