Merge "Fix NPE with cluster invocation and reporter"