fix #3234: trackable in hands of cacher problems
Merge branch 'release' into upstream