ref #6806 Fix dirty state handling and saving in feature tree editor