Merge remote-tracking branch 'gitlab/master'

Change-Id: I3bf7df01070bf05236930d0f8d013f9d8306cf79