Merge remote branch 'kevmccor/edihistory_3'