Merge "Don't speed-compile dump method" into main