364790beaf
PR: 258701 Based on the submission by: sigsys@gmail.com MFC after: 1 week
PR: 258701 Based on the submission by: sigsys@gmail.com MFC after: 1 week