Issue 998847 3