Merge "Fix issue #16013164: Externally Reported Moderate:"