Merge branch 'hotfix-53'
optimizer04 & solver04: bug fix in constructor call of 3BCID
Merge branch 'master' into develop