created merge request !1908 (merged) to address this issue
mentioned in merge request !1908 (merged)
closed with commit 1c6f50fc
mentioned in commit 1c6f50fc