I met the same problem, so much inconvenient, and curious how Apple works in progress for this since my project is depended on this.