Merge "Do HFieldGet first to avoid explicit null check."