Merge remote-tracking branch 'origin/Ryan-Branch' into Corey-Branch
patient fix
Merge remote-tracking branch 'origin/Corey-Branch' into Ryan-Branch