Adding JB's changes up to 7/23
Merge branch 'prod-changes'