Adapt tests to change in trackable image size
Merge branch 'release' into upstream