Polish
Merge remote-tracking branch 'upstream/master'
Fixing FlatFileValues test
Merge pull request #775 from lev-kuznetsov/master

Fixes build