Merge branch 'seperate_insert_from_update' into timeline_and_image_analyzer

this pull request has bot timeline and image analyzer