This is block5-6 version for !2044 (diffs) . Plan to use it for A&S week wg presentation.
c.c. to @shzheng @gromolin