Merge "Fix issue #5054723: java.lang.NullPointerException at..."