Merge branch '1762-usage-of-w_mac_32_32-one_in_q30' into 'main'

Resolve "Usage of W_mac_32_32() + ONE_IN_Q30"

Closes #1762

See merge request !1927