Merge "Fixing broken logging of OTHER events" into pi-dev