reviews needed (collection of rubric fixes)

Some reviews needed for latest fixes I added to Rubric repository:

Issue 16622 Merge latest rubric fixes(and subcases).

btw the monkey does not check the issue 16622 (all subcases are resolved and a

configuration is provided, did I miss something?)

nicolai