GitLab

* changes to Cecilia's commit
* proposal to fix bug differently ...

behatnotneeded

Change-Id: I4bc084e1d4505ed3de844f63f218ff05260b66c8