Static analyser fix
Merge branch 'master' into query-parameters