Merged my_picture block to master