issues #562 and #570 fixed
Merge remote-tracking branch 'upstream/development' into development
Unit test timing problem fixed
Merge pull request #571 from Bohdan-Tereta/development

Issues #562 and #570 fixed