Fixed merge conflicts from merging in Master from original