Back port fixes for child getter context.