Merge "Reduce duplicated invocation of sendNewConfiguration" into main