Merge branch 'hv/submodule-find-ff-merge'