constness fix, re #8085
Merge branch 'bugfix/8085_integration_boundaries' into develop