Merge branch 'bug_fixes_precision_impr_1' into 'main'

Bug fixes and precision improvements - 2

See merge request !1089