Story 49871451: Finishing up help modals with display and updates
Merge branch 'master' into develop