null-merge from 3.3