Issue/ff 7180 whatshot reintegration