Merge branch '__images'