Created attachment 210125 [details] Proposed patch
Changelogs: https://wordpress.org/support/wordpress-version/version-5-2-5/ (bugfix) https://wordpress.org/support/wordpress-version/version-5-3/ (feature) https://wordpress.org/support/wordpress-version/version-5-3-1 (security) https://wordpress.org/support/wordpress-version/version-5-3-2 (bugfix)
landed in r520902