Issue #13554 Additional updates based on peer review