Count all support for the range shift use case, gradle build cleanup