Merge "Remove 'hani' in reordering script."