diff --git a/.circleci/config.yml b/.circleci/config.yml
index aee6b0b8ec..ac7e5bb0d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
           command: docker-compose run --rm postgres psql -h postgres -U postgres -c "create database tests;"
       - run:
           name: Run Tests
-          command: docker-compose run --name tests redash tests --junitxml=junit.xml tests/
+          command: docker-compose run --name tests redash tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
       - run:
           name: Copy Test Results
           command: |
@@ -58,6 +58,7 @@ jobs:
     environment:
       COMPOSE_FILE: .circleci/docker-compose.cypress.yml
       COMPOSE_PROJECT_NAME: cypress
+      PERCY_TOKEN_ENCODED: MWM3OGUzNzk4ZWQ2NTE4YTBhMDAwZDNiNWE1Nzc4ZjEzZjYyMzY1MjE0NjY0NDRiOGE5ODc5ZGYzYTU4ZmE4NQ==
     docker:
       - image: circleci/node:8
     steps:
@@ -65,15 +66,16 @@ jobs:
       - checkout
       - run:
           name: Install npm dependencies
-          command: npm install
+          command: |
+            npm install
       - run:
           name: Setup Redash server
           command: |
-            npm run cypress:server start-ci
-            docker-compose run cypress node ./cypress/cypress-server.js setup
+            npm run cypress start
+            docker-compose run cypress node ./cypress/cypress.js db-seed
       - run:
           name: Execute Cypress tests
-          command: docker-compose run cypress ./node_modules/.bin/cypress run
+          command: npm run cypress run-ci
   build-tarball:
     docker:
       - image: circleci/node:8
@@ -81,9 +83,9 @@ jobs:
       - checkout
       - run: sudo apt install python-pip
       - run: npm install
+      - run: .circleci/update_version
       - run: npm run bundle
       - run: npm run build
-      - run: .circleci/update_version
       - run: .circleci/pack
       - store_artifacts:
           path: /tmp/artifacts/
diff --git a/.circleci/docker-compose.cypress.yml b/.circleci/docker-compose.cypress.yml
index 024e5b7e0e..2581d5d1a9 100644
--- a/.circleci/docker-compose.cypress.yml
+++ b/.circleci/docker-compose.cypress.yml
@@ -34,6 +34,10 @@ services:
       - worker
     environment:
       CYPRESS_baseUrl: "http://server:5000"
+      PERCY_TOKEN: ${PERCY_TOKEN}
+      PERCY_BRANCH: ${CIRCLE_BRANCH}
+      PERCY_COMMIT: ${CIRCLE_SHA1}
+      PERCY_PULL_REQUEST: ${CIRCLE_PR_NUMBER}
   redis:
     image: redis:3.0-alpine
     restart: unless-stopped
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 7447a7e7cd..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-#####################################################################
-#
-# Need support? USE THE FORUM! https://discuss.redash.io/c/support.
-#
-# Don't have steps to reproduce and actually not sure it's a bug?
-# Use the forum! https://discuss.redash.io/c/support.
-#
-#####################################################################
-
-**Got an idea for a new feature?** Check if it isn't on the roadmap already: https://bit.ly/redash-roadmap and start a new discussion in the features category: https://discuss.redash.io/c/feature-requests 🌟.
-
-Found a bug? Please fill out the sections below... thank you 👍
-
-Found a security vulnerability? Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use this PGP key.
-
--->
-
-### Issue Summary
-
-A summary of the issue and the browser/OS environment in which it occurs.
-
-### Steps to Reproduce
-
-1. This is the first step
-2. This is the second step, etc.
-
-Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
-
-### Technical details:
-
-* Redash Version:
-* Browser/OS:
-* How did you install Redash:
diff --git a/.github/ISSUE_TEMPLATE/---bug_report.md b/.github/ISSUE_TEMPLATE/---bug_report.md
new file mode 100644
index 0000000000..f376d6f1ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug_report.md
@@ -0,0 +1,34 @@
+---
+name: "\U0001F41B Bug report"
+about: Report reproducible software issues so we can improve
+---
+
+<!--
+
+We use GitHub only for bug reports 🐛
+
+Anything else should be posted to https://discuss.redash.io 👫
+
+🚨For support, help & questions use https://discuss.redash.io/c/support
+💡For feature requests & ideas use https://discuss.redash.io/c/feature-requests
+
+**Found a security vulnerability?** Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use this PGP key.
+
+-->
+
+### Issue Summary
+
+A summary of the issue and the browser/OS environment in which it occurs.
+
+### Steps to Reproduce
+
+1. This is the first step
+2. This is the second step, etc.
+
+Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
+
+### Technical details:
+
+* Redash Version:
+* Browser/OS:
+* How did you install Redash:
diff --git a/.github/ISSUE_TEMPLATE/--anything_else.md b/.github/ISSUE_TEMPLATE/--anything_else.md
new file mode 100644
index 0000000000..9db411b781
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/--anything_else.md
@@ -0,0 +1,17 @@
+---
+name: "\U0001F4A1Anything else"
+about: "For help, support, features & ideas - please use https://discuss.redash.io \U0001F46B "
+labels: "Support Question"
+---
+
+We use GitHub only for bug reports 🐛
+
+Anything else should be posted to https://discuss.redash.io 👫
+
+🚨For support, help & questions use https://discuss.redash.io/c/support
+💡For feature requests & ideas use https://discuss.redash.io/c/feature-requests
+
+Alternatively, check out these resources below. Thanks! 😁.
+
+- [Forum](https://disucss.redash.io)
+- [Knowledge Base](https://redash.io/help)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbb4a8f3c9..9341e1c32d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Change Log
 
+## v6.0.0 - 2018-12-16
+
+v6.0.0 release version. Mainly includes  fixes for regressions from the beta version. 
+
+This release had contributions from 5 people: @rauchy, @denisov-vlad, @arikfr, @ariarijp, and @gabrieldutra. Thank you, everyone 🙏
+
+### Changed
+
+* #3183 Make refresh_queries less noisey in logs. @arikfr
+
+### Fixed
+
+* #3163 Include correct version in production builds. @rauchy
+* #3161 Clickhouse: fix int() conversion error. @denisov-vlad
+* #3166 Directly using record_event task requires timestamp. @arikfr
+* #3167 Alert.evaluate failing when the column is missing. @arikfr
+* ##3162 Remove API permissions for users who have been disabled. @rauchy
+* #3171 Reject empty query name. @ariarijp
+* #3175, #3186 Fix disable error message. @rauchy, @gabrieldutra
+* #3182 [Redshift] support for schema names with dots. @arikfr
+* #3187 Safely create_app in Celery code (try to fetch current_app first). @arikfr
+
+### Other
+
+* #3155 Add DB Seed to Cypress and setup Percy. @gabrieldutra
+* #3180 Remove coverage from pytest terminal output. @rauchy
+
+
 ## v6.0.0-beta - 2018-12-03
 
 This release was 2 months in the making and it is full with good stuff! 
diff --git a/Dockerfile.cypress b/Dockerfile.cypress
index 31f619ba56..3efef14f49 100644
--- a/Dockerfile.cypress
+++ b/Dockerfile.cypress
@@ -1,10 +1,11 @@
 FROM cypress/browsers:chrome67
 
-WORKDIR /usr/src/app
+ENV APP /usr/src/app
+WORKDIR $APP
 
-RUN npm install cypress > /dev/null
+RUN npm install --no-save cypress @percy/cypress > /dev/null
 
-COPY cypress /usr/src/app/cypress
-COPY cypress.json /usr/src/app/cypress.json
+COPY cypress $APP/cypress
+COPY cypress.json $APP/cypress.json
 
 RUN ./node_modules/.bin/cypress verify
diff --git a/README.md b/README.md
index 51fc205254..243fbc42ef 100644
--- a/README.md
+++ b/README.md
@@ -28,13 +28,12 @@ Today **_Redash_** has support for querying multiple databases, including: Redsh
 
 ## Supported Data Sources
 
-Redash supports more than 25 [data sources](https://redash.io/help/data-sources/supported-data-sources). 
+Redash supports more than 35 [data sources](https://redash.io/help/data-sources/supported-data-sources). 
 
 ## Getting Help
 
 * Issues: https://github.com/getredash/redash/issues
 * Discussion Forum: https://discuss.redash.io/
-* Slack: http://slack.redash.io/
 
 ## Reporting Bugs and Contributing Code
 
diff --git a/client/app/components/EditInPlace.jsx b/client/app/components/EditInPlace.jsx
index f10134118b..369f5d470b 100644
--- a/client/app/components/EditInPlace.jsx
+++ b/client/app/components/EditInPlace.jsx
@@ -40,7 +40,7 @@ export class EditInPlace extends React.Component {
 
   stopEditing = () => {
     const newValue = this.inputRef.current.value;
-    const ignorableBlank = this.props.ignoreBlanks && this.props.value === '';
+    const ignorableBlank = this.props.ignoreBlanks && newValue === '';
     if (!ignorableBlank && newValue !== this.props.value) {
       this.props.onDone(newValue);
     }
diff --git a/client/app/components/QueryEditor.jsx b/client/app/components/QueryEditor.jsx
index 268babbb13..9da2abb81f 100644
--- a/client/app/components/QueryEditor.jsx
+++ b/client/app/components/QueryEditor.jsx
@@ -179,7 +179,7 @@ class QueryEditor extends React.Component {
     const isExecuteDisabled = this.props.queryExecuting || !this.props.canExecuteQuery();
 
     return (
-      <section style={{ height: '100%' }}>
+      <section style={{ height: '100%' }} data-test="QueryEditor">
         <div className="container p-15 m-b-10" style={{ height: '100%' }}>
           <div style={{ height: 'calc(100% - 40px)', marginBottom: '0px' }} className="editor__container">
             <AceEditor
@@ -262,6 +262,7 @@ class QueryEditor extends React.Component {
                   className={'btn btn-primary m-l-5' + (isExecuteDisabled ? ' disabled' : '')}
                   disabled={isExecuteDisabled}
                   onClick={this.props.executeQuery}
+                  data-test="ExecuteButton"
                 >
                   <span className="zmdi zmdi-play" />
                   <span className="hidden-xs m-l-5">Execute</span>
diff --git a/client/app/components/app-header/app-header.html b/client/app/components/app-header/app-header.html
index 18ee1ea8fc..cb31912cf7 100644
--- a/client/app/components/app-header/app-header.html
+++ b/client/app/components/app-header/app-header.html
@@ -86,7 +86,7 @@
           <!--<a href="users" title="Settings"><i class="fa fa-cog"></i></a>-->
         <!--</li>-->
         <li class="dropdown" uib-dropdown>
-          <a href="#" class="dropdown-toggle dropdown--profile" uib-dropdown-toggle data-cy="dropdown-profile">
+          <a href="#" class="dropdown-toggle dropdown--profile" uib-dropdown-toggle data-test="ProfileDropdown">
             <img ng-src="{{ $ctrl.currentUser.profile_image_url }}" class="profile__image--navbar" width="20"/>
             <span class="dropdown--profile__username" ng-bind="$ctrl.currentUser.name"></span> <span
             class="caret caret--nav"></span></a>
diff --git a/client/app/components/dynamic-form.html b/client/app/components/dynamic-form.html
index 0378ea4c22..50037be5c0 100644
--- a/client/app/components/dynamic-form.html
+++ b/client/app/components/dynamic-form.html
@@ -1,7 +1,8 @@
 <form name="dynamicForm">
     <div class="form-group required" ng-class='{"has-error": (dynamicForm.targetName | showError)}'>
         <label class="control-label" for="dataSourceName">Name</label>
-        <input type="string" class="form-control" name="targetName" ng-model="target.name" autofocus required>
+        <input type="string" class="form-control" name="targetName" ng-model="target.name"
+               data-test="TargetName" autofocus required>
         <error-messages input="dynamicForm.targetName" form="dynamicForm"></error-messages>
     </div>
     <hr>
@@ -9,12 +10,12 @@
         <label ng-if="field.property.type !== 'checkbox'" class="control-label">{{field.property.title || field.name | toHuman}}</label>
         <input name="input" type="{{field.property.type}}" class="form-control" ng-model="target.options[field.name]" ng-required="field.property.required"
                ng-if="field.property.type !== 'file' && field.property.type !== 'checkbox'" accesskey="tab" placeholder="{{field.property.default}}"
-               data-cy="{{field.property.title || field.name | toHuman}}">
+               data-test="{{field.property.title || field.name | toHuman}}">
 
         <label ng-if="field.property.type=='checkbox'">
             <input name="input" type="{{field.property.type}}" ng-model="target.options[field.name]" ng-required="field.property.required"
                    ng-if="field.property.type !== 'file'" accesskey="tab" placeholder="{{field.property.default}}"
-                   data-cy="{{field.property.title || field.name | toHuman}}">
+                   data-test="{{field.property.title || field.name | toHuman}}">
             {{field.property.title || field.name | toHuman}}
         </label>
 
@@ -25,7 +26,7 @@
         <error-messages input="inner.input" form="inner"></error-messages>
     </div>
 
-    <button class="btn btn-block btn-primary m-b-10" ng-disabled="!dynamicForm.$valid" ng-click="saveChanges()">Save</button>
+    <button class="btn btn-block btn-primary m-b-10" ng-disabled="!dynamicForm.$valid" ng-click="saveChanges()" data-test="Submit">Save</button>
     <span ng-repeat="action in actions">
         <button class="btn"
                 ng-class="action.class"
diff --git a/client/app/components/dynamic-table/dynamic-table.html b/client/app/components/dynamic-table/dynamic-table.html
index 645cbc5c67..fcc7d1afa8 100644
--- a/client/app/components/dynamic-table/dynamic-table.html
+++ b/client/app/components/dynamic-table/dynamic-table.html
@@ -1,5 +1,5 @@
 <div class="dynamic-table-container">
-  <table class="table table-condensed table-hover">
+  <table class="table table-condensed table-hover" data-test="DynamicTable">
     <thead>
       <tr>
         <th ng-repeat="column in $ctrl.columns" ng-click="$ctrl.onColumnHeaderClick($event, column)"
diff --git a/client/app/components/type-picker.html b/client/app/components/type-picker.html
index 7f3c2623cb..c622f17cba 100644
--- a/client/app/components/type-picker.html
+++ b/client/app/components/type-picker.html
@@ -10,7 +10,7 @@ <h3 class="text-center">{{$ctrl.title}}</h3>
     </div>
 
     <div class="row">
-        <div class="col-lg-12 database-source">
+        <div class="col-lg-12 database-source" data-test="DatabaseSource">
             <div class="visual-card" ng-repeat="type in $ctrl.types | filter:$ctrl.filter:strict" ng-click="$ctrl.onTypeSelect(type)">
             <img ng-src="{{$ctrl.imgRoot}}/{{type.type}}.png" alt="{{type.name}}">
             <h3>{{type.name}}</h3>
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 8d8307d262..2e841a7baf 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -83,7 +83,8 @@ <h3>
   <main class="query-fullscreen">
     <nav resizable r-directions="['right']" r-flex="true" resizable-toggle toggle-shortcut="Alt+Shift+D, Alt+D">
       <div class="editor__left__data-source">
-        <ui-select ng-model="query.data_source_id" remove-selected="false" ng-disabled="!isQueryOwner || !sourceMode" on-select="updateDataSource()">
+        <ui-select ng-model="query.data_source_id" remove-selected="false" ng-disabled="!isQueryOwner || !sourceMode"
+          on-select="updateDataSource()" data-test="SelectDataSource">
           <ui-select-match placeholder="Select Data Source...">{{$select.selected.name}}</ui-select-match>
           <ui-select-choices repeat="ds.id as ds in dataSources | filter:$select.search">
             {{ds.name}}
diff --git a/client/app/services/user.js b/client/app/services/user.js
index 988d85113e..3103d13c75 100644
--- a/client/app/services/user.js
+++ b/client/app/services/user.js
@@ -36,11 +36,12 @@ function disableUser(user, toastr, $sanitize) {
       return data;
     })
     .catch((response) => {
-      let message = response instanceof Error ? response.message : response.statusText;
-      if (!isString(message)) {
-        message = 'Unknown error';
-      }
-      toastr.error(`Cannot disable user <b>${userName}</b><br>${message}`, { allowHtml: true });
+      const message =
+        response.data && response.data.message
+          ? response.data.message
+          : `Cannot disable user <b>${userName}</b><br>${response.statusText}`;
+
+      toastr.error(message, { allowHtml: true });
     });
 }
 
diff --git a/cypress.json b/cypress.json
index f152b0cf66..c4043d1fa5 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,3 +1,4 @@
 {
-  "baseUrl": "http://localhost:5000"
+  "baseUrl": "http://localhost:5000",
+  "video": false
 }
diff --git a/cypress/cypress-server.js b/cypress/cypress-server.js
deleted file mode 100644
index 1661de7275..0000000000
--- a/cypress/cypress-server.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies, no-console */
-const { execSync } = require('child_process');
-const { post } = require('request');
-
-function execSetup() {
-  console.log('Running setup...');
-
-  const setupData = {
-    name: 'Example Admin',
-    email: 'admin@redash.io',
-    password: 'password',
-    org_name: 'Redash',
-  };
-
-  const baseUrl = process.env.CYPRESS_baseUrl || 'http://localhost:5000';
-
-  post(baseUrl + '/setup', { formData: setupData });
-}
-
-function startServer() {
-  console.log('Starting the server...');
-            
-  execSync('docker-compose -p cypress build --build-arg skip_ds_deps=true', { stdio: 'inherit' });
-  execSync('docker-compose -p cypress up -d', { stdio: 'inherit' });
-  execSync('docker-compose -p cypress run server create_db', { stdio: 'inherit' });
-}
-
-function stopServer() {
-  console.log('Stopping the server...');
-  execSync('docker-compose -p cypress down', { stdio: 'inherit' });
-}
-
-const command = process.argv[2];
-
-switch (command) {
-  case 'start':
-    startServer();
-    execSetup();
-    break;
-  case 'start-ci':
-    startServer();
-    break;
-  case 'setup':
-    execSetup();
-    break;
-  case 'stop':
-    stopServer();
-    break;
-  default:
-    console.log('Usage: npm run cypress:server start|stop');
-    break;
-}
diff --git a/cypress/cypress.js b/cypress/cypress.js
new file mode 100644
index 0000000000..3363b437e1
--- /dev/null
+++ b/cypress/cypress.js
@@ -0,0 +1,72 @@
+/* eslint-disable import/no-extraneous-dependencies, no-console */
+const atob = require('atob');
+const { execSync } = require('child_process');
+const { post } = require('request').defaults({ jar: true });
+const { seedData } = require('./seed-data');
+
+const baseUrl = process.env.CYPRESS_baseUrl || 'http://localhost:5000';
+
+function seedDatabase(seedValues) {
+  const request = seedValues.shift();
+  const data = request.type === 'form' ? { formData: request.data } : { json: request.data };
+
+  post(baseUrl + request.route, data, (err, response) => {
+    const result = response ? response.statusCode : err;
+    console.log('POST ' + request.route + ' - ' + result);
+    if (seedValues.length) {
+      seedDatabase(seedValues);
+    }
+  });
+}
+
+function startServer() {
+  console.log('Starting the server...');
+
+  execSync('docker-compose -p cypress build --build-arg skip_ds_deps=true', { stdio: 'inherit' });
+  execSync('docker-compose -p cypress up -d', { stdio: 'inherit' });
+  execSync('docker-compose -p cypress run server create_db', { stdio: 'inherit' });
+}
+
+function stopServer() {
+  console.log('Stopping the server...');
+  execSync('docker-compose -p cypress down', { stdio: 'inherit' });
+}
+
+function runCypressCI() {
+  if (process.env.PERCY_TOKEN_ENCODED) {
+    process.env.PERCY_TOKEN = atob(`${process.env.PERCY_TOKEN_ENCODED}`);
+  }
+  execSync('docker-compose run cypress ./node_modules/.bin/percy exec -- ./node_modules/.bin/cypress run --browser chrome', { stdio: 'inherit' });
+}
+
+const command = process.argv[2] || 'all';
+
+switch (command) {
+  case 'start':
+    startServer();
+    break;
+  case 'db-seed':
+    seedDatabase(seedData);
+    break;
+  case 'run':
+    execSync('cypress run --browser chrome', { stdio: 'inherit' });
+    break;
+  case 'open':
+    execSync('cypress open', { stdio: 'inherit' });
+    break;
+  case 'run-ci':
+    runCypressCI();
+    break;
+  case 'stop':
+    stopServer();
+    break;
+  case 'all':
+    startServer();
+    seedDatabase(seedData);
+    execSync('cypress run --browser chrome', { stdio: 'inherit' });
+    stopServer();
+    break;
+  default:
+    console.log('Usage: npm run cypress [start|db-seed|open|run|stop]');
+    break;
+}
diff --git a/cypress/integration/data-source/create_data_source_spec.js b/cypress/integration/data-source/create_data_source_spec.js
index a89835cb3e..773b000ab4 100644
--- a/cypress/integration/data-source/create_data_source_spec.js
+++ b/cypress/integration/data-source/create_data_source_spec.js
@@ -1,18 +1,17 @@
 describe('Create Data Source', () => {
   beforeEach(() => {
     cy.login();
-    cy.visit('/data_sources');
+    cy.visit('/data_sources/new');
   });
 
   it('creates a new PostgreSQL data source', () => {
-    cy.contains('New Data Source').click();
-    cy.contains('PostgreSQL').click();
+    cy.getByTestId('DatabaseSource').contains('PostgreSQL').click();
 
-    cy.get('[name=targetName]').type('Redash');
-    cy.get('[data-cy=Host]').type('{selectall}localhost');
-    cy.get('[data-cy=User]').type('postgres');
-    cy.get('[data-cy=Password]').type('postgres');
-    cy.get('[data-cy="Database Name"]').type('postgres{enter}');
+    cy.getByTestId('TargetName').type('Redash');
+    cy.getByTestId('Host').type('{selectall}postgres');
+    cy.getByTestId('User').type('postgres');
+    cy.getByTestId('Password').type('postgres');
+    cy.getByTestId('Database Name').type('postgres{enter}');
 
     cy.contains('Saved.');
   });
diff --git a/cypress/integration/query/create_query_spec.js b/cypress/integration/query/create_query_spec.js
new file mode 100644
index 0000000000..844a0501a6
--- /dev/null
+++ b/cypress/integration/query/create_query_spec.js
@@ -0,0 +1,21 @@
+describe('Create Query', () => {
+  beforeEach(() => {
+    cy.login();
+    cy.visit('/queries/new');
+  });
+
+  it('executes the query', () => {
+    cy.getByTestId('SelectDataSource')
+      .click()
+      .contains('Test PostgreSQL').click();
+
+    cy.getByTestId('QueryEditor')
+      .get('.ace_text-input')
+      .type('SELECT id, name FROM organizations{esc}', { force: true });
+
+    cy.getByTestId('ExecuteButton').click();
+
+    cy.getByTestId('DynamicTable').should('exist');
+    cy.percySnapshot('Edit Query page');
+  });
+});
diff --git a/cypress/integration/user/login_spec.js b/cypress/integration/user/login_spec.js
index 136b87ace5..bc759567a3 100644
--- a/cypress/integration/user/login_spec.js
+++ b/cypress/integration/user/login_spec.js
@@ -3,22 +3,28 @@ describe('Login', () => {
     cy.visit('/login');
   });
 
-  it('greets the user', () => {
+  it('greets the user and take a screenshot', () => {
     cy.contains('h3', 'Login to Redash');
+
+    cy.wait(1000);
+    cy.percySnapshot('Login page');
   });
 
   it('shows message on failed login', () => {
-    cy.get('#inputEmail').type('admin@redash.io');
-    cy.get('#inputPassword').type('wrongpassword{enter}');
+    cy.getByTestId('Email').type('admin@redash.io');
+    cy.getByTestId('Password').type('wrongpassword{enter}');
 
-    cy.get('.alert').should('contain', 'Wrong email or password.');
+    cy.getByTestId('ErrorMessage').should('contain', 'Wrong email or password.');
   });
 
   it('navigates to homepage with successful login', () => {
-    cy.get('#inputEmail').type('admin@redash.io');
-    cy.get('#inputPassword').type('password{enter}');
+    cy.getByTestId('Email').type('admin@redash.io');
+    cy.getByTestId('Password').type('password{enter}');
 
     cy.title().should('eq', 'Redash');
     cy.contains('Example Admin');
+
+    cy.wait(1000);
+    cy.percySnapshot('Homepage');
   });
 });
diff --git a/cypress/integration/user/logout_spec.js b/cypress/integration/user/logout_spec.js
index 8648935053..bc6fb0314e 100644
--- a/cypress/integration/user/logout_spec.js
+++ b/cypress/integration/user/logout_spec.js
@@ -5,7 +5,7 @@ describe('Logout', () => {
   });
 
   it('shows login page after logout', () => {
-    cy.get('[data-cy=dropdown-profile]').click();
+    cy.getByTestId('ProfileDropdown').click();
     cy.contains('Log out').click();
 
     cy.title().should('eq', 'Login to Redash');
diff --git a/cypress/seed-data.js b/cypress/seed-data.js
new file mode 100644
index 0000000000..cd19f849a0
--- /dev/null
+++ b/cypress/seed-data.js
@@ -0,0 +1,35 @@
+exports.seedData = [
+  {
+    route: '/setup',
+    type: 'form',
+    data: {
+      name: 'Example Admin',
+      email: 'admin@redash.io',
+      password: 'password',
+      org_name: 'Redash',
+    },
+  },
+  {
+    route: '/login',
+    type: 'form',
+    data: {
+      email: 'admin@redash.io',
+      password: 'password',
+    },
+  },
+  {
+    route: '/api/data_sources',
+    type: 'json',
+    data: {
+      name: 'Test PostgreSQL',
+      options: {
+        dbname: 'postgres',
+        host: 'postgres',
+        port: 5432,
+        sslmode: 'prefer',
+        user: 'postgres',
+      },
+      type: 'pg',
+    },
+  },
+];
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 1121e49624..91edf307b6 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -1,3 +1,5 @@
+import '@percy/cypress';
+
 Cypress.Commands.add('login', () => {
   const users = {
     admin: {
@@ -13,3 +15,5 @@ Cypress.Commands.add('login', () => {
     body: users.admin,
   });
 });
+
+Cypress.Commands.add('getByTestId', element => cy.get('[data-test="' + element + '"]'));
diff --git a/package-lock.json b/package-lock.json
index 40e22e638a..3780bd309b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "6.0.0-beta",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a93c262653..565de8fd4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "6.0.0-beta",
+  "version": "6.0.0",
   "description": "The frontend part of Redash.",
   "main": "index.js",
   "scripts": {
@@ -13,11 +13,8 @@
     "analyze:build": "npm run clean && NODE_ENV=production BUNDLE_ANALYZER=on webpack",
     "test": "jest",
     "test:watch": "jest --watch",
-    "cypress:install": "npm install --no-save cypress",
-    "cypress:server": "node cypress/cypress-server.js",
-    "cypress:run": "cypress run",
-    "cypress:open": "cypress open",
-    "cypress": "npm run cypress:server start && cypress run && npm run cypress:server stop"
+    "cypress:install": "npm install --no-save cypress @percy/cypress",
+    "cypress": "node cypress/cypress.js"
   },
   "repository": {
     "type": "git",
diff --git a/pytest.ini b/pytest.ini
index c07aa69a0e..fdafc074e5 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,2 @@
 [pytest]
-addopts = --cov-report xml --cov-report=term-missing --cov=redash --cov-config .coveragerc
 norecursedirs = *.egg .eggs dist build docs .tox
diff --git a/redash/__init__.py b/redash/__init__.py
index 3b8be2e534..942550908c 100644
--- a/redash/__init__.py
+++ b/redash/__init__.py
@@ -3,7 +3,7 @@
 import urlparse
 import urllib
 import redis
-from flask import Flask
+from flask import Flask, current_app
 from flask_sslify import SSLify
 from werkzeug.contrib.fixers import ProxyFix
 from werkzeug.routing import BaseConverter
@@ -18,7 +18,7 @@
 from redash.destinations import import_destinations
 
 
-__version__ = '6.0.0-beta'
+__version__ = '6.0.0'
 
 
 def setup_logging():
@@ -141,3 +141,11 @@ def create_app(load_admin=True):
     chrome_logger.init_app(app)
 
     return app
+
+
+def safe_create_app():
+    """Return current_app or create a new one."""
+    if current_app:
+        return current_app
+
+    return create_app()
diff --git a/redash/authentication/__init__.py b/redash/authentication/__init__.py
index ef0cb32a27..ef8cd3147e 100644
--- a/redash/authentication/__init__.py
+++ b/redash/authentication/__init__.py
@@ -1,19 +1,18 @@
-from flask_login import LoginManager, user_logged_in, login_user, logout_user
-from sqlalchemy.orm.exc import NoResultFound
 import hashlib
 import hmac
-import time
 import logging
-
-from flask import redirect, request, jsonify, url_for
+import time
 from urlparse import urlsplit, urlunsplit
-from werkzeug.exceptions import Unauthorized
 
+from flask import jsonify, redirect, request, url_for
+from flask_login import LoginManager, login_user, logout_user, user_logged_in
 from redash import models, settings
-from redash.settings.organization import settings as org_settings
 from redash.authentication import jwt_auth
 from redash.authentication.org_resolving import current_org
+from redash.settings.organization import settings as org_settings
 from redash.tasks import record_event
+from sqlalchemy.orm.exc import NoResultFound
+from werkzeug.exceptions import Unauthorized
 
 login_manager = LoginManager()
 logger = logging.getLogger('authentication')
@@ -102,6 +101,8 @@ def get_user_from_api_key(api_key, query_id):
     org = current_org._get_current_object()
     try:
         user = models.User.get_by_api_key_and_org(api_key, org)
+        if user.is_disabled:
+            user = None
     except models.NoResultFound:
         try:
             api_key = models.ApiKey.get_by_api_key(api_key)
@@ -171,7 +172,7 @@ def jwt_token_load_user_from_request(request):
 
 def log_user_logged_in(app, user):
     event = {
-        'org_id': current_org.id,
+        'org_id': user.org_id,
         'user_id': user.id,
         'action': 'login',
         'object_type': 'redash',
diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py
index 40d5fd7f88..f752cae01a 100644
--- a/redash/handlers/query_results.py
+++ b/redash/handlers/query_results.py
@@ -5,7 +5,7 @@
 from flask_login import current_user
 from flask_restful import abort
 from redash import models, settings
-from redash.tasks import QueryTask, record_event
+from redash.tasks import QueryTask
 from redash.permissions import require_permission, not_view_only, has_access, require_access, view_only
 from redash.handlers.base import BaseResource, get_object_or_404
 from redash.utils import (collect_query_parameters,
@@ -225,7 +225,7 @@ def get(self, query_id=None, query_result_id=None, filetype='json'):
                     event['object_type'] = 'query_result'
                     event['object_id'] = query_result_id
 
-                record_event.delay(event)
+                self.record_event(event)
 
             if filetype == 'json':
                 response = self.make_json_response(query_result)
diff --git a/redash/handlers/users.py b/redash/handlers/users.py
index ceb1052fdd..e7244de4b8 100644
--- a/redash/handlers/users.py
+++ b/redash/handlers/users.py
@@ -219,7 +219,7 @@ def post(self, user_id):
         # admin cannot disable self; current user is an admin (`@require_admin`)
         # so just check user id
         if user.id == current_user.id:
-            abort(400, message="You cannot disable your own account. "
+            abort(403, message="You cannot disable your own account. "
                                "Please ask another admin to do this for you.")
         user.disable()
         models.db.session.commit()
diff --git a/redash/models.py b/redash/models.py
index 54c7697794..d8d1904346 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -1308,7 +1308,8 @@ def get_by_id_and_org(cls, id, org):
 
     def evaluate(self):
         data = json_loads(self.query_rel.latest_query_data.data)
-        if data['rows']:
+
+        if data['rows'] and self.options['column'] in data['rows'][0]:
             value = data['rows'][0][self.options['column']]
             op = self.options['op']
 
diff --git a/redash/query_runner/clickhouse.py b/redash/query_runner/clickhouse.py
index 95a7b17caf..a51328531a 100644
--- a/redash/query_runner/clickhouse.py
+++ b/redash/query_runner/clickhouse.py
@@ -111,7 +111,7 @@ def _clickhouse_query(self, query):
             column_name = r['name']
             column_type = self._define_column_type(r['type'])
 
-            if 'Int64' in r['type']:
+            if r['type'] in ('Int64', 'UInt64', 'Nullable(Int64)', 'Nullable(UInt64)'):
                 columns_int64.append(column_name)
             else:
                 columns_totals[column_name] = 'Total' if column_type == TYPE_STRING else None
@@ -121,7 +121,10 @@ def _clickhouse_query(self, query):
         rows = result['data']
         for row in rows:
             for column in columns_int64:
-                row[column] = int(row[column])
+                try:
+                    row[column] = int(row[column])
+                except TypeError:
+                    row[column] = None
 
         if 'totals' in result:
             totals = result['totals']
diff --git a/redash/query_runner/pg.py b/redash/query_runner/pg.py
index a6fb2a18e3..96aa03c07d 100644
--- a/redash/query_runner/pg.py
+++ b/redash/query_runner/pg.py
@@ -269,7 +269,7 @@ def _get_tables(self, schema):
             HAS_SCHEMA_PRIVILEGE(table_schema, 'USAGE') AND
             (
                 table_schema IN (SELECT schemaname FROM SVV_EXTERNAL_SCHEMAS) OR
-                HAS_TABLE_PRIVILEGE(table_schema || '.' || table_name, 'SELECT')
+                HAS_TABLE_PRIVILEGE('"' || table_schema || '"."' || table_name || '"', 'SELECT')
             )
         ORDER BY table_name, pos
         """
diff --git a/redash/tasks/queries.py b/redash/tasks/queries.py
index b9f471fab7..4f44c3b854 100644
--- a/redash/tasks/queries.py
+++ b/redash/tasks/queries.py
@@ -275,7 +275,7 @@ def refresh_queries():
             if settings.FEATURE_DISABLE_REFRESH_QUERIES:
                 logging.info("Disabled refresh queries.")
             elif query.org.is_disabled:
-                logging.info("Skipping refresh of %s because org is disabled.", query.id)
+                logging.debug("Skipping refresh of %s because org is disabled.", query.id)
             elif query.data_source is None:
                 logging.info("Skipping refresh of %s because the datasource is none.", query.id)
             elif query.data_source.paused:
diff --git a/redash/templates/login.html b/redash/templates/login.html
index 36e112e65e..27248493e3 100644
--- a/redash/templates/login.html
+++ b/redash/templates/login.html
@@ -8,7 +8,7 @@
     {% with messages = get_flashed_messages() %}
       {% if messages %}
         {% for message in messages %}
-          <div class="alert alert-danger" role="alert">{{ message }}</div>
+          <div class="alert alert-danger" role="alert" data-test="ErrorMessage">{{ message }}</div>
         {% endfor %}
       {% endif %}
     {% endwith %}
@@ -41,11 +41,11 @@
       <input type="hidden" name="remember" value="on">
       <div class="form-group">
         <label for="inputEmail">{{ username_prompt or 'Email' }}</label>
-        <input type="text" class="form-control" id="inputEmail" name="email" value="{{email}}">
+        <input type="text" class="form-control" id="inputEmail" name="email" value="{{email}}" data-test="Email">
       </div>
       <div class="form-group">
         <label for="inputPassword">Password</label>
-        <input type="password" class="form-control" id="inputPassword" name="password">
+        <input type="password" class="form-control" id="inputPassword" name="password" data-test="Password">
       </div>
 
       <button type="submit" class="btn btn-primary btn-block m-t-25">Log In</button>
diff --git a/redash/worker.py b/redash/worker.py
index d39d720df1..0a3224a0ae 100644
--- a/redash/worker.py
+++ b/redash/worker.py
@@ -8,7 +8,7 @@
 from celery import Celery
 from celery.schedules import crontab
 from celery.signals import worker_process_init
-from redash import __version__, create_app, settings
+from redash import __version__, safe_create_app, settings
 from redash.metrics import celery as celery_metrics
 
 celery = Celery('redash',
@@ -77,14 +77,14 @@ def __call__(self, *args, **kwargs):
 # Create Flask app after forking a new worker, to make sure no resources are shared between processes.
 @worker_process_init.connect
 def init_celery_flask_app(**kwargs):
-    app = create_app()
+    app = safe_create_app()
     app.app_context().push()
 
 
 # Hook for extensions to add periodic tasks.
 @celery.on_after_configure.connect
 def add_periodic_tasks(sender, **kwargs):
-    app = create_app()
+    app = safe_create_app()
     periodic_tasks = getattr(app, 'periodic_tasks', {})
     for params in periodic_tasks.values():
         sender.add_periodic_task(**params)
diff --git a/tests/handlers/test_users.py b/tests/handlers/test_users.py
index 71fb9b0e0b..77c76cdd9d 100644
--- a/tests/handlers/test_users.py
+++ b/tests/handlers/test_users.py
@@ -16,7 +16,7 @@ def test_returns_400_when_missing_fields(self):
 
         rv = self.make_request('post', '/api/users', data={'name': 'User'}, user=admin)
         self.assertEqual(rv.status_code, 400)
-    
+
     def test_returns_400_when_using_temporary_email(self):
         admin = self.factory.create_admin()
 
@@ -149,7 +149,7 @@ def test_changes_password(self):
 
         user = models.User.query.get(self.factory.user.id)
         self.assertTrue(user.verify_password(new_password))
-    
+
     def test_returns_400_when_using_temporary_email(self):
         admin = self.factory.create_admin()
 
@@ -203,7 +203,7 @@ def test_admin_cannot_disable_self(self):
         self.assertFalse(admin_user.is_disabled)
 
         rv = self.make_request('post', "/api/users/{}/disable".format(admin_user.id), user=admin_user)
-        self.assertEqual(rv.status_code, 400)
+        self.assertEqual(rv.status_code, 403)
 
         # user should stay enabled
         admin_user = models.User.query.get(admin_user.id)
diff --git a/tests/models/test_alerts.py b/tests/models/test_alerts.py
index c11aef2e6b..673f383444 100644
--- a/tests/models/test_alerts.py
+++ b/tests/models/test_alerts.py
@@ -1,5 +1,6 @@
 from tests import BaseTestCase
 from redash.models import Alert, db
+from redash.utils import json_dumps
 
 
 class TestAlertAll(BaseTestCase):
@@ -36,3 +37,28 @@ def test_return_each_alert_only_once(self):
         alerts = Alert.all(group_ids=[self.factory.default_group.id, group.id])
         self.assertEqual(1, len(list(alerts)))
         self.assertIn(alert, alerts)
+
+
+def get_results(value):
+    return json_dumps({'rows': [{'foo': value}], 'columns': [{'name': 'foo', 'type': 'STRING'}]})
+
+
+class TestAlertEvaluate(BaseTestCase):
+    def create_alert(self, results, column='foo'):
+        result = self.factory.create_query_result(data=results)
+        query = self.factory.create_query(latest_query_data_id=result.id)
+        alert = self.factory.create_alert(query_rel=query, options={'op': 'equals', 'column': column, 'value': 1})
+        return alert
+
+    def test_evaluate_triggers_alert_when_equal(self):
+        alert = self.create_alert(get_results(1))
+        self.assertEqual(alert.evaluate(), Alert.TRIGGERED_STATE)
+
+    def test_evaluate_return_unknown_when_missing_column(self):
+        alert = self.create_alert(get_results(1), column='bar')
+        self.assertEqual(alert.evaluate(), Alert.UNKNOWN_STATE)
+
+    def test_evaluate_return_unknown_when_empty_results(self):
+        results = json_dumps({'rows': [], 'columns': [{'name': 'foo', 'type': 'STRING'}]})
+        alert = self.create_alert(results)
+        self.assertEqual(alert.evaluate(), Alert.UNKNOWN_STATE)
\ No newline at end of file
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 03618701e9..3cf1d8b1f2 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -1,18 +1,19 @@
 import os
 import time
 
-from flask import request
-from mock import patch
 from six.moves import reload_module
-from sqlalchemy.orm.exc import NoResultFound
-from tests import BaseTestCase
 
+from flask import request
+from mock import patch
 from redash import models, settings
 from redash.authentication import (api_key_load_user_from_request,
                                    get_login_url, hmac_load_user_from_request,
                                    sign)
 from redash.authentication.google_oauth import (create_and_login_user,
                                                 verify_profile)
+from redash.utils import utcnow
+from sqlalchemy.orm.exc import NoResultFound
+from tests import BaseTestCase
 
 
 class TestApiKeyAuthentication(BaseTestCase):
@@ -54,6 +55,14 @@ def test_user_api_key(self):
             rv = c.get(self.queries_url, query_string={'api_key': user.api_key})
             self.assertEqual(user.id, api_key_load_user_from_request(request).id)
 
+    def test_disabled_user_api_key(self):
+        user = self.factory.create_user(api_key="user_key")
+        user.disable()
+        models.db.session.flush()
+        with self.app.test_client() as c:
+            rv = c.get(self.queries_url, query_string={'api_key': user.api_key})
+            self.assertEqual(None, api_key_load_user_from_request(request))
+
     def test_api_key_header(self):
         with self.app.test_client() as c:
             rv = c.get(self.query_url, headers={'Authorization': "Key {}".format(self.api_key)})