Issue 6954 resolved