Merge branch '2064-image-blanking' into 'develop'