#4137 Continue disentangling