merge from 2.0-ongoing @ 3581