Merge "Fix eslint warnings and switch to error code"