- Merged from master
- Added in place edit