added bwc for #852, #851, #841