Merge "Fixed the incorrect message for enabling new data"