Dymanic Quarry Energy, for 6.1.x

The same as #1800 ,
but for 6.1.x as suggested.