Update files after CB20140503