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