fixes to master

Change-Id: I03d7d3a913e03cb7dac84591761e15aaf9b157bd
rezolved merge conglict

Change-Id: If9a5bb14bd6d6a248b6abfb861638f27bb29ddb8