backport merge of #454

Closed dzmitry-lahoda closed 6 months ago