Merge branch 'lsk-3.10-gator-5.21' into lsk-3.10-gator