fixes commit b954f3b5 Gitlab: #617 Change-Id: I82b6f9f229b173279bfcd3c200b73690d752b670
mentioned in commit 5fd4d2e0