Pulling in some changes from jlemsdev to prep for gap junc support