Merge branch 'master' into staging
Whitespace fixup
Memoize cleanhtml()

[#71106096]
Merge branch 'master' into staging
Merge branch 'staging' into stable