85bccf6e0b
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d': DO NOT MERGE Removing an activity that shouldn't go into samples