[master/f21-branch] Follow-up for moving the sanity check