Complete 2.4.10 Resolve Pending Issues

Keep approval status on editing