Merge pull request #626 from bakaid/MINIFICPP-984-linter

MINIFICPP-984 - Fix linter errors