Partial 2.4.10 Resolve Pending Issues

developed id a little