GC-350 Updating with rebase and changes from Cory