Merge "Suppress null-dereference warning temporarily"