removed changes to doc
Cherrypicked changed from develop branch to prepare for merge