cw 3.17.12 compat (closes #3547823) [applied]