Since milestones has been implemented, this PR will fix #3407 --------- Co-authored-by: Jason Song <[email protected]>