Merge "fix: cannot determine the type of modules with class 'samples'"