Merge "Fix refresh action"