
            Additional fixes for GH-1071

052b75c