Syncing Andrei's changes

Taken from release