Fix a building problem
Merge branch 'const_reorder_2' into softsyn_2