Fixed error with missing columns detection.
Merge branch 'master' into public