null merge from 2.6