merged shadow_walker changes