Merged with master. Auto rescaling & smoothing operational.