Yesterday
merge from hotreload_fix