PBI-10 Approval: comix 4.0.4_4 (josh)