This is a force-pushed squash of two PR merges (#5919, #5940) that were formerly present on master as individual commits. Co-Authored-By: kyle shockey <kyleshockey@gmail.com>
.js
.jsx
* housekeeping: `.js` -> `.jsx` where necessary