Add initial config for testing
Merge branch 'master' into feature_a