Issues # 836, #845, #8413