Re-creating MR 186
MR re-created from this: !186 (closed) Re-creating due to a mysterious error from gitlab while merging the branch to master.
MR re-created from this: !186 (closed) Re-creating due to a mysterious error from gitlab while merging the branch to master.