Issue 998847 5