Issue #LOOP-81 by tj: Merged patch files