merge: changes from github/master up to 7d009dd4d395948fcfc3af72ed662262fc9c87c4

Change-Id: I97ec8d5b71ef9cd2fe7fa77c75c8524fe7b2d7d2
merging gerrit/master