Merge "Remove logspam for resolved bug" into 24D1-dev