Fixed subdim exporting
Merge branch 'master' into match_on_memory