Issues #763, #831, #833