Merge branch 'cherry-pick-e683e1df' into 'releases/2.5'
Merge branch 'cleanup/extra-semicolon' into 'master'
[cleanup] fix warning: extra ‘;’ [-Wpedantic]
This removes the extra ‘;’ warnings when compiling with -Wpedantic.
See merge request !176
See merge request !184