merge from 2.4 , block compile error