merge solved ba7aaa8904186cae4963eee0f2b124aa6aa320e3
merge solved ba7aaa8904186cae4963eee0f2b124aa6aa320e3
intact <> degraded
merge solved conflict feature/idn