Dev to refactoring merge