Fixing autoscaler component merge issues