Merge "Changed bug id in comments" into main