continue debugging and fix lots of linter issues
[skip ci] shippable build 48.1