Merge "Update developer-guide."