Prepare for stable docs
Fix merge