[#10010] more work in progress