[ai-0.36-18] vs files improvements
[ai-0.36-19] reduce core changes
pull