Merge branch '2484-macro-break-should-be-replaced-by-break' into 'main'

Resolve "Macro "break" should be replaced by BREAK"

Closes #2484

See merge request !2885