Markhoeber/documentation/analytics sprint 12

For AN-261 and AN-260