Trying to fix the mess with const/non const char
Merge remote-tracking branch 'origin/develop' into develop