ref #7829, ref #7800 improve nom. ref. matcher (also changes the result type => needs adaptation in client Apps)
ref #7829, ref #7800 improve nom. ref. matcher (also changes the result type => needs adaptation in client Apps)