api: linting issues fixed.
repository: linting issues fixed.
Merge remote-tracking branch 'origin/master'