Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  Fix commit 7f4a7b891332899cea26e95be0337aae01648742: dont mix code and declarations.