Merge daily fixes

[Delivers #66820510]