Extend config defaults with arg props
Merge branch 'develop'