Merging Strycore modifications