one more special conditional to deal with decompose-disabled spec compiling...
Merge branch 'development' into gumbo