Fixing assignment validity (MID-1819)
fix for NPE in query engine, org. structure queries.
disabled query engine enhancements
Merge branch 'master' into parser