(cherry picked from commit 0c4024ce)
mentioned in commit 6a09634c
mentioned in merge request !125 (merged)