Build 6513 of branch wafflecone