Fix some inconsistencies in distributed feature merging, still not fully solved
Fix some inconsistencies in distributed feature merging, still not fully solved

DerThorsten/nifty,DerThorsten/nifty,DerThorsten/nifty,DerThorsten/nifty,DerThorsten/nifty