Merge "Fix null pointer exception in QC#actionsToEntries"