Added Untested API.
API merge, warning cleanup