Hopefully last commit for 3.5.4 of quarry
Of course I forgot to update the todo for quarry section