Changed 'target_context' to 'scope' in mainline.