Merge branch 't/image-0.5'