gitlab #624 Change-Id: I186c49de0590f4832e7f6337505001db81c057bf (cherry picked from commit acf5a3bf)