debugging, still not working for Test2
Found the issue for max flat generation error
Merge branch 'master' into Test2