Changes in add_ratio_constraint
Merge branch 'master' into kai-branch