close #8
Merge branch 'feature/8-remove-client-side-augmentation' into dev