https://atomic.jira.com/browse/PION-1115
https://atomic.jira.com/browse/PION-1115

Updating more defaults


acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core