Resolve NOTICE merge conflicts

1 job for !285 with fix_whitesource in 30 seconds (queued for 1 second)
merge request