Merge release/4.1.3 into develop

Merge the latest changes from the 4.1.3 release into develop.

There were a bunch of cherry picked commits for this release, so I may end up skipping this merge entirely if it's a hot mess.