refs: #12954
Merge pull request #3 from piotrkrych/master

refs: #12954