Mostly null merge from 2.6; tag added