Merge "Listen to changes in unused threshold" into sc-dev