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