Add empty constructor and mapping to BaselineConfigSpec
Merge branch 'dev' into public-cloud