Issue #13554 Update based on peer review