Please resolve the issue by this milestone