Ilia

Dear developers, could you take a look on the PR and decide is it OK to merge such changes into main branch? Thank you in advance!