merge compile_fix into master