test: merge entries
Merge branch 'master' into bugs
Merge entries