Merge "Update developer guide"