New changes from tsypa

Rebase