- Legacy-Id: 7932

Author: levkowetz

hold-for-merge

@@ -1,3 +1,4 @@
+personal/liudapeng/v5.5.1-dev0@7925	# alternative resolution desired
 personal/rjs/v5.2.0@7544
 personal/liudapeng/v5.0.2@7399
 personal/rcross/v5.4.1@7771	# Already fixed in [7664], in a slightly more future-safe way