Integrating detach().
Merged master.
Merged master.