Merge branch 'precision_improvements_bug_fixes' into 'main'

Precision improvements and bug fixes for encoder

See merge request !1024