Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811