I just read code in #921 , sure thing , it's a great help to me, we can push the related patch first :)