Null merge 3.5

Changes were backported (transplated) from default to 3.5.