Merged in recactoring into Dev
merge fix