Hello, everyone!

A rebased version is attached. Also, fixed potential race in the test and detailed commit messages.

Best regards,

Mikhail.