Partial 2.4.10 Resolve Pending Issues

Developed resolve issues form a little