Merge "Fix parsing enum types in incident report tool as well as adding some additional loggings"