Merge "Fixed and decreased isAtEquilibrium thresholds" into sc-dev