synchronization with yota2 branch