Merge branch 'jims_marckhacks' into Release_2_8_1_Branch