Merge entries from v1.5.7