Issue 7174

For review