setting defaults
Merge upstream