Porting documentation changes from `rewrite` branch