Added a self-take-over record feature
Merge branch 'my'