Remove references to -api URLs
Add support for two character instance ids
@27.0.8