Merge "User CURRENT for display notification" into main