Merge branch 'ctxt.2022.07.05a' into HEAD