Merge changes from topic 'documentation_summaries_2'