Recreated patch to fix issue 2238135.
Re-created patch for issue: 2247685.
Merge https://github.com/sdstyles/csua