Merge branch 'release/bugfix'