Merge "Change the misused logic" into main