Merge "Fix infinite recursion on action module import" into feature/zuulv3