This is just a bunch of quick fixes that could be released.

I will be on vacation for a week, so #2941 will be released after I'm back (Aug 5).

Issues

• fix #2918
• fix #2950

What's Changed

• v4.0.0-beta.319 by @andrasbacsai in #2961

Full Changelog: v4.0.0-beta.318...v4.0.0-beta.319