Merge branch 'const_reorder_no_state' into softsyn