Issue #LOOP-77 by tj: Merged patch files