Pull helper function changes from master