Merge "Use custom metadata object for all logging" into pi-dev