[SUBMODULE] Fixes after rebasing in submodule applied.