Cherry pick

Squashed commits:

[e86691a] no message