fix linter issues
[skip ci] shippable build 12.1