Merge "BUG-2876: prune empty subtree modifications"