Sync with support and blog
Cleanup forward docs