Bug-fix:

 - Correctly handle empty patch types in 2D parallel
 - Bring some changes from branches into sync