Applied the patch for ticket a6d69107d5