Issues # 836, #845, #851, #855, #824