Merge 'Feature-01' to V.8.12

1. edit
2. delete
3. create