Merge "BUG-1933: consult state in subtree modified path"