Temorary failures

This merge request replaces !559 (closed) and closes #397 (closed)

The only difference from this branch and !559 (closed) is that we use consistent wording to mark the addition of new APIs.