Story 47500509: fixing changes from rejected story
Story 46236017: rejected story fixes
Story 44499479: committing stashed changes
Stories 47500509, 44499479
Stories 47500509, 44499479
Merge remote-tracking branch 'github/dev-brendan'