Merge "Manual integration of I32a7b5 from froyo" into kraken