Merge commit 'smcv/img-bugfix'