Merge "Add override status into dump"