Merge "Correct associated bug" into main