Content Backport

Backporting content from newer versions with high fidelity - probably