Update to recent version

Synchronized with other repo