New version after merging from upstream