Merge "Remove logspam for resolved bug" into main