[DF-185] Fixed function implementation
Merge branch 'to_master' of https://github.com/dava/dava.framework into to_master