Merge branch '3gpp_issue_822_fix_1' into 'main'

Division and modulus operator optimizations - 1

See merge request !488