Fix uninitialized variables
merge upstream develop