created merge request !133 (merged) to address this issue
mentioned in merge request !133 (merged)
closed with commit 9b41b178