Merge "Fix sonars from dependency upgrade"