Merge "Don't copy the __pycache__ folder" into feature/zuulv3