GitLab: #1127 GitLab: #1632 Change-Id: I57f340aeb71a7df00d47f86c66eb5f21f5e35601
mentioned in issue #1662