Merge "Allow to add a bug number to ravenwood annotations" into main