Review markups for #21619, add new test that failed previously.