Merged in recactoring into Dev