gitlab #679 Change-Id: I4c297a9a3ed258e16b2cd3663b63115748c6ae61 (cherry picked from commit ac7b954f)