Some additional fixes for schema conversion
Merge branch 'stable' into multicon