Hi, in the Catarsis fork we already tried to merge the submodules back to core and it worked. Merging and cherrypicking of former changes is possible when supplying an additional parameter. Wouldn't it be better to merge them back into core instead of keeping them for any good reason? Greetz, Tom