[yrashk]

Please bear in mind that it's not a final version yet – it is a snapshot from a PR.

Few more cases are being worked on!