Merge fix for 5.18. Make dist