complete commit #9896