Incorporate files and edits from other Image Segmentation branch