Merge "Revert "Revert "Ensure void type is resolved when running without image"""