I have the same issue. Any solution found? Apple rejected my app many times because of this issue