Revert merge with dev branch