Merge pull request #62 from lensky84/11548_added_new_functional

11548 added new functional
fix all tests
Merge remote-tracking branch 'remotes/upstream/master' into 11548_added_new_functional