Merge "Warning fix for asg_context_create"