merge changes from master

Change-Id: Idc5fa28df77198fea44b986770a3fe63dcb1a22f
fixes after merging from master

Change-Id: I2dd63e415028fa0ecd65ae405bf0c69a4e937924