TDI-30470 ： Can't save schema to a folder under "Generic schemas"
Merge branch 'maintenance/5.6'