Cherry-pick in release/0.18 with fixes for tf linter

Merge request reports

Loading