420.19 Issue76 branch - Prep for merge with dev