Restored changes from dev branch

After there were merging problems with dev, this is an attempt to restore recent changes.