Merge "Change to prevent invalid memory access"