Fix ordering bug in type management (compiler)
Merge branch 'master' into feature_based_scheduling_develop