Merge "Update core logic to change how to" into elalto