merge last changes from dopa-dev

Change-Id: I695664285190bb52fe68ad7a281f7087c5dfe8ad