Merge 1.2.18 fixes on master