Merged RefactorMessages with Development