Post images should be conditional
Merge branch 'fix-post-images'