Merge branch 'hotfix_CMReference'
Merge branch 'NewInfraBranch'
Merge branch 'NewInfraBranch'
Merge branch 'NewInfraBranch'
Merge branch 'NewInfraBranch'
update: created a new startup costs ddr
Merge branch 'feature_addStartUpCosts' into NewInfraBranch