Merge from 3.0 fixes branch