miner change of upper initial condition
Merge branch 'master' into resistive