Just pulling in some changes from the current sensing branch.