Migrated from r9 on google codes