Issue #423 fix after  #429 implementation
Issue #413 fixed
Issue #463 partially fixed
Merge pull request #469 from Bohdan-Tereta/test

Issue #423, #413, #463, #474 fix after  #429 implementation