PROBCORE-426 Fixed overlapping boxes in Formula View
Merge remote-tracking branch 'origin/develop' into develop