Merging jc_updates with master

merge