Merge "Strip not split the untrusted_wrapper" into feature/zuulv3