First merge of public API into stable.