Merge "Fix issue #19272671: Context unclear or missing..."