Merge changes from topic "Istanbul-doc-update"