Dock stripping

This PR contains
- Merged from develop
- Dock stripping