fix #3585: trackable name and type not parsed
Update tests
Merge branch 'release' into upstream