Merge branch 'hotfix/formulae'
104
Merge branch 'hotfix/104' into develop
row fix