final merge to master

Bringing chris_kira_SA up to date with master