Merge "Write out image bitmap inside of image file." into klp-dev