Add variant 18_abf_pe_w_load
Add variant 19_abf_pe_w_cmat_load
Merge branch 'master' of https://github.com/jlehtoma/zsetup-esmk