created merge request !1738 (merged) to address this issue
mentioned in merge request !1738 (merged)
closed with commit f9e98c78
mentioned in commit f9e98c78