Address complaint from cppcheck, prefer prefix--, re #8051
Merge branch 'bugfix/8085_integration_boundaries' into develop