Merge "profcollect: gracefully handle ServiceSpecificException" into main