API[38]_Essam_ResolveIssues

@mansoursaid001 Please review and merge