ASF: Adds support for pictures

Do not merge before merging #397