const-> constant
Fixes/workarounds for tests.
Merge branch 'poc-7+'