Better implementation of 20015e72
Fix #10345
Fix add features dialog
Fix #10362