handle compile failure in 31.0
Merge remote-tracking branch 'origin/compile' into joe