Upstream

Merges all changes from the unstable branch