Resolve NOTICE merge conflicts

1 job for !285 with fix_whitesource in 37 minutes and 9 seconds (queued for 2 seconds)
merge request