Merge branch 'feature/update-eslint-stylelint' into feature/3570945