Add transactional annotation to export json resource
Adding image directory..
Merging with upstream:master and cleaning up.