fix id and type (not allowed variable names)
Merge remote-tracking branch 'origin' into devel
Merge remote-tracking branch 'origin/devel' into devel